Skip to contentSkip to conversation

Change in openvpn[master]: GHA: Pin version of CMake for all builds

Openvpn-devel In review flichtenheld (Code Review) 2 participants 6 messages Apr 1, 2025 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): gerrit.1743525501000.Ief11d5d7ccae084c863b50054d4e97c71f57d6f0@...2715...

#1 lore raw

Attention is currently required from: plaisthos.

Hello plaisthos,

I'd like you to do a code review.
Please visit

    http://gerrit.openvpn.net/c/openvpn/+/929?usp=email

to review the following change.

Change subject: GHA: Pin version of CMake for all builds
......................................................................

GHA: Pin version of CMake for all builds

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

---
M .github/workflows/build.yaml

1 file changed, 5 insertions(+), 2 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/929/1

.github/workflows/build.yaml +5 -2
index b1af7ec..617b866 100644
@@ -54,6 +54,7 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -78,10 +79,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -457,13 +459,14 @@
 
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y cmake gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
+        run: sudo apt update && sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
       - name: "AWS-LC: checkout"
         uses: actions/[email protected]... # v4.2.2
         with:
           path: aws-lc
           repository: aws/aws-lc
           ref: v1.42.0
+      - uses: lukka/[email protected]... # v3.31.6
       - name: "AWS-LC: build"
         run: |
           mkdir build

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/929?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 929
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-MessageType: newchange

#2 lore raw
In reply to a message not in the archive

Attention is currently required from: flichtenheld, plaisthos.

cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/929?usp=email )

Change subject: GHA: Pin version of CMake for all builds
......................................................................

Patch Set 1: Code-Review+2

(1 comment)

Patchset:

PS1:
tested GH building, works. Not waiting for the buildbots...

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/929?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 929
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 01 Apr 2025 17:03:57 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment

#3 lore raw

PATCH 1/1 GHA: Pin version of CMake for all builds

In reply to a message not in the archive

From: Frank Lichtenheld <[email protected]...>

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

---

This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.

Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/929
This mail reflects revision 1 of this Change.

Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>

.github/workflows/build.yaml +5 -2
index b1af7ec..617b866 100644
@@ -54,6 +54,7 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -78,10 +79,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -457,13 +459,14 @@
 
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y cmake gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
+        run: sudo apt update && sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
       - name: "AWS-LC: checkout"
         uses: actions/[email protected]... # v4.2.2
         with:
           path: aws-lc
           repository: aws/aws-lc
           ref: v1.42.0
+      - uses: lukka/[email protected]... # v3.31.6
       - name: "AWS-LC: build"
         run: |
           mkdir build
#4 lore raw

[Openvpn-devel] [PATCH applied] Re: GHA: Pin version of CMake for all builds

Thanks for fixing the Github-induced explosions... tested in my repo, builds now succeed again. Back to #926...

Your patch has been applied to the master branch.

commit da65c4fdde20e36df38a90c1f1ef1d8ebf486c28

Author: Frank Lichtenheld
Date:   Tue Apr 1 19:04:14 2025 +0200
     GHA: Pin version of CMake for all builds

     Signed-off-by: Frank Lichtenheld <[email protected]...>
     Acked-by: Gert Doering <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg31299.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering

#5 lore raw
In reply to a message not in the archive

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/929?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by cron2

Change subject: GHA: Pin version of CMake for all builds
......................................................................

GHA: Pin version of CMake for all builds

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

---
M .github/workflows/build.yaml

1 file changed, 5 insertions(+), 2 deletions(-)

git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/29/929/2

.github/workflows/build.yaml +5 -2
index b1af7ec..617b866 100644
@@ -54,6 +54,7 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -78,10 +79,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -457,13 +459,14 @@
 
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y cmake gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
+        run: sudo apt update && sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
       - name: "AWS-LC: checkout"
         uses: actions/[email protected]... # v4.2.2
         with:
           path: aws-lc
           repository: aws/aws-lc
           ref: v1.42.0
+      - uses: lukka/[email protected]... # v3.31.6
       - name: "AWS-LC: build"
         run: |
           mkdir build

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/929?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 929
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset

#6 lore raw
In reply to a message not in the archive

cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/929?usp=email )

Change subject: GHA: Pin version of CMake for all builds
......................................................................

GHA: Pin version of CMake for all builds

Turns out that "apt install cmake" is useless since Github installs also CMake but not as a package. So make sure we control which CMake we get and not Github.

Switch to get-cmake action (which also installs ninja) and remove the installation via apt.

Change-Id Ief11d5d7ccae084c863b50054d4e97c71f57d6f0

Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg31299.html

---
M .github/workflows/build.yaml

1 file changed, 5 insertions(+), 2 deletions(-)
.github/workflows/build.yaml +5 -2
index b1af7ec..617b866 100644
@@ -54,6 +54,7 @@
     steps:
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -78,10 +79,11 @@
       VCPKG_ROOT: ${{ github.workspace }}/vcpkg
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y mingw-w64 unzip cmake ninja-build build-essential wget python3-docutils man2html-base
+        run: sudo apt update && sudo apt install -y mingw-w64 unzip build-essential wget python3-docutils man2html-base
       - name: Checkout OpenVPN
         uses: actions/[email protected]... # v4.2.2
 
+      - uses: lukka/[email protected]... # v3.31.6
       - name: Restore from cache and install vcpkg
         uses: lukka/[email protected]... # v11.5
         with:
@@ -457,13 +459,14 @@
 
     steps:
       - name: Install dependencies
-        run: sudo apt update && sudo apt install -y cmake gcc ninja-build golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
+        run: sudo apt update && sudo apt install -y gcc golang make liblzo2-dev libpam0g-dev liblz4-dev linux-libc-dev man2html clang libcmocka-dev python3-docutils python3-jinja2 python3-jsonschema libtool automake autoconf pkg-config libcap-ng-dev libnl-genl-3-dev
       - name: "AWS-LC: checkout"
         uses: actions/[email protected]... # v4.2.2
         with:
           path: aws-lc
           repository: aws/aws-lc
           ref: v1.42.0
+      - uses: lukka/[email protected]... # v3.31.6
       - name: "AWS-LC: build"
         run: |
           mkdir build

--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/929?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings

Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ief11d5d7ccae084c863b50054d4e97c71f57d6f0
Gerrit-Change-Number: 929
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged